bitkeeper revision 1.76.1.1 (3e54fc23zcQZlR65KsPYjjBI9M-6Hg)

modifications to newdom scripts. Example invocations:

newdom <size> <image> <ip> <root details>

really ./newdom 16000 ../../../xenolinux-2.4.16-kdb/arch/xeno/boot/image 128.232.35.xxx root=/dev/nfs nfsroot=/usr/groups/srgboot/hhh/roots/root1

really ./newdom 16000 ../../../xenolinux-2.4.16-kdb/arch/xeno/boot/image 128.232.35.xxx root=/dev/xhdaNNN

[fill in hhh, xxx and NNN as appropriate]

diff --git a/tools/domain_builder/dom_builder.c b/tools/domain_builder/dom_builder.c
index d2df002a675147bff08ac517c8d057015f633379..18bc64373433176f735b0a4c4158fe032757922f 100644 (file)
--- a/tools/domain_builder/dom_builder.c
+++ b/tools/domain_builder/dom_builder.c
@@ -474,7 +474,10 @@ int main(int argc, char **argv)
     if(launch_domain(meminfo) != 0)
        ret = -1;
 
-    free(meminfo);
+    
 out:
-    return ret;
+    if( ret >= 0 )
+       return meminfo->domain;
+    else 
+       return ret;
 }

diff --git a/tools/domain_builder/newdom b/tools/domain_builder/newdom
index 979661ec26d602feae4a50db1cf001c13a68a9c9..3b0612638c3d85cb701099f20b08cce954da48ba 100644 (file)
--- a/tools/domain_builder/newdom
+++ b/tools/domain_builder/newdom
@@ -1,17 +1,30 @@
 #!/bin/sh
 
+# newdom <size> <image> <ip> <root details>  
+# newdom 262144 ../../../xenolinux-2.4.16-kdb/arch/xeno/boot/image 128.232.35.240 root=/dev/nfs nfsroot=/usr/groups/srgboot/xxx/roots/root0
+# newdom 262144 ../../../xenolinux-2.4.16-kdb/arch/xeno/boot/image 128.232.35.240 root=/dev/xhda7 
+
+
 VIFINIT=./vifinit
 DOM_BUILDER=./domain_builder
 
-DOM=$2
+SIZE=${1:?"size missing"}
+IMAGE=${2:?"image missing"}
+IP=${3:?"IP missing"}
+
+shift; shift; shift
+
+echo ARGS $*
+
+$DOM_BUILDER $SIZE $IMAGE 1 ro ip=$IP:128.232.32.20:128.232.32.1:255.255.240.0::eth0:off $*
+DOM=$?
+
+echo DOM= $DOM
 
-ADDR=`/sbin/ifconfig eth0 | grep inet.addr | sed -e 's/.*inet addr:\([0-9.]*\) .*/\1/'`
+VIF=`cat /proc/xeno/dom$DOM/vif`
 
-LO=`echo $ADDR | sed -e 's/[0-9]\+\.[0-9]\+\.[0-9]\+\.\([0-9]\+\)/\1/'`
-HI=`echo $ADDR | sed -e 's/\([0-9]\+\.[0-9]\+\.[0-9]\+\)\.[0-9]\+/\1/'`
+echo VIF= $VIF
 
-NEWADDR=$HI.$[LO+DOM]
+$VIFINIT $VIF $IP
 
-$VIFINIT $DOM $NEWADDR
 
-$DOM_BUILDER 16000 $1 1

diff --git a/tools/domain_builder/vifinit b/tools/domain_builder/vifinit
old mode 100644 (file)
new mode 100755 (executable)